Added remove option
Added list option