rewrite dataclause handler