Update for Option API changes