WIP: fixed doctrine adapter