Modified manager and added classes