Added support for overlays