Make stronger use of classes