make servicechooser add and remove work with assignment types