Updated guard rule engine