Mission objectives refactoring