Updates for demo application