Switch to new-style classes