Preparation for modules
Module build fixed