Renamed class to reflect what it is actually doing