Added hashed table
Fixed problems with generics