Add support for adding and removing overlays