Added mechanism to understand passed Option value.