Improve interface
Update demo data