WIP Use Doctrine QueryBuilder