Added a few more logic to Manager