MODE-1683 Renamed the class to be a bit more clear