[unstable] Add location details