Added voice handling