Better class definition