Added some hash-sets and -maps