Fixed doctrine mapping
Mapping fixes