Added check for Option