Adding improved overlay handling, added support for both overlays currently existing with the same API