last changes before integrate doctrine