Add location check