Backend changes to support kiosk-mode