Added support for edit forms