Small changes to use new style classes