Added PathResolver