Enhance options flow