Added edit support