Adding support for drawing other primitives