Demo maintenance