Working on migration for usage refactor