Changed class creation