Migrate to new baseami