Tweak configuration
Added bundle for demo