Added support for editing