Added inplace edit support