Implemented Resolver suport. #3