Refactor resolve methods in new case route
Merge branch 'new-refactor'