Added soundset support