Updated to work with new EE 2.6 Relationships