added dataflow handler, starting to refine statement handler