Improved build for modules stuff