Added custom sound support