JH: Adding current location support