Promoted everything to classes