UML-195: Enhance check connectable and connector tool