Added the rest of the classes