add Skip options, prepare to modify code for add/delete operations