Added TODO for Relations