Minor tweak to model for speed improvement. Data was being assigned twice after a relation was created.