Update for Option API change