Added support for hashsets