Added options for all and list