Renamed class to make it more clear