Improved library integration in demo app