Added initial support for inline editing