Updated models, then added hstore at end