Changed all classes to new-style