Renamed base helper classes