Added plain object support to Option values.