Modified location plugin