Added requirement on contact location for contact entity