Added support for editing values manually