Refactored the managers to allow to add library clients