Changed class structure.