Ensure we're using new style classes