Updated schema --- should be reasonably backwards compatible