Adding support for rules