Location validation added