Cleaner implementation of relationships