Implemented logic to add module classes