Renamed Class to make more sense