Migrate to .rule system