Implement latest DB schema from John