Upgraded migration library to remove panic