Separated out the classes