Migrating the our custom options framework...