update to use CQL Tables only