Update to support inline editing