Added support for graphics