Changed class's structure
Changed class