Implemented Location resolution