Simplify OverlayLayer, remove internal details