WARNING: this changes -mappings to +mappings. Fixed findOrCreate mappings