Merge "Move constants from service to manager"