This should fix the class structure