Latest updates to support demo app