Renamed manager and added some extra functions