Modules class and fixes