Working on location service