Is there a way to better manage discovered port classes?