Improve schema migration