Generalized the demos to make them easier to deploy