Renamed some functions to fit better for MapCell