Better implementation of property owner