Interface change and demo stubs