Adds entitlement check to state checks