Support Option values
CR: Barlocker