Add in extra handling of schema versions