Added support for circle, clear and write