Updated to allow module blocks for modules