Cinnamon support added