Added support for drawing extra layers