Demos and small interface change