Feature/kiosk support