Preserved non-browser context support