- Work on resolver mechanism refactoring