Changed class system