Updated find method to search both properties and associations.