Added options processing check