Update Demo mode according new API