Added expiration
changed map type from string to custom value