Starting to add support for sound type