Working on the class structure