Finishing migration from 1.0