Add the rest of the classes