[WIP] Extract Doctrine hybrid support

re-order uses