[WIP] Extract Doctrine hybrid support