Regarding drafts on migration
refactor