Migration to new-style classes