Continued work on migration of data