Make DefaultOverlayHandler more extensible