Updated Generator to build specific modules