Changes for browser reuse