Added more work to add Modules