Converted all classes to new-style