added PathResolver