Added data migration support