Add rewriter converter and makes better dependency check