Enable mandatory variables again and add support for browser and non-browser view