Added form-based workflow functionality