Removed some unused code and added extra Resolver constructor