Changed class's structure