Updated doctrine mapping pass