Update support for multiple types in schema definition
Update to demos - custom example