Minor additions to round out the demo project