Renamed functions to work with new scheme