Thanks for all the suggestions guys. It appears that this has fixed my particular problem. Without migration.