added more logical permuitations to connection types and device types