Updated doctrine mapping