Small Refact and added new Managers