Continuing work on migration for usage refactor