Adding CDC query capabilities