Changed class methods