Adding necessary manager and DAO changes to support all services