Refactored Components to use relation() in constructor where appropriate