Module builder upgrade

Some fixes and optimizations for the Module Builder