Added deletion and editing