Updates for changes to DB schema and message structure