Added AttributeKeyName context for attribute key names