Refactor services to support missions