Add modules and change core class