Added remove option