added separation of connection types into class/type and contributor