Add support for specifying SR form fields