Reduce use of Base.execute_cql