Added support for regulatory endpoint. untested