Adding support for tm set selection