Implemented location mapping