Added different recognition of values