Migrate opts to new system