added handling for Options