Updated namespace for drawing code