Legacy driver renamed, new driver introduced
Query can be filled by commands