Add support for set & zset