Added a couple of custom rules