First attempt to migrate the QueryParser