Prepare for rules representation rewrite