Added hset support