Small changes, options needed for data migration