Refactored relations