Added options to set null