Added support for editting rules and conditions