Added support for Donut type and updated demo