Refactoring to simplify the table created by doctrine