Revert back to related objectives structure