Fixed doctrine mapping