Refactor Relationship Properties