Update some classes to use new style object