Added extra options remove and insert