Update schema
Update to new exchange/queue format