Updated to support changing default Set as well