Refactored the connections. Will do the same with operand types.
Both connections and operand types is now refactored.