corrected doctrine mappings