add: resolver functionality
refactor: removed unnecessary inner function in resolver