doctrine mapping refactoring