Tweaks done to classes
Manager added