Added more flexibility to the sound system