Added unset feature