Changed class structure