Fixed format of the classes