Added more infomation to be collected regarding Location.