Made rules 4.5.0 compliant