Small changes for migration