Updating to latest schema & examples