Add support to map[string]struct