update adapter factory
moar doctrine stuff cleaning