Code improvements and custom modules