Changed syntax to new-style Python classes