Added the class structure