Changing class to new-style