Add support for browser-only