Added new features in the manager