add better support for SET and RMF