Complete add, edit, delete part