Should be ready for migration