Corrected relationships in models and collections