Add rewriter class for future use