Re-add Ids to location module.