Added editing, deleitiion and completion