Rules evaluation overhaul