Changed methods and constructor arguments for trad