Refactored / renamed manager methods