added support for editing more fields