refactored package of resolver