Added validation and manager name