Operation, Identity, and Navigation Refactor