Added edit, update and validation