corrected associations and mappings