Added modules to a lot of classes