More tweaking with class definitions