Renamed to more accurately reflect it uses classes