Completed Support for inline-editing