Issue 484 - Combine Connectors and Contexts into a single column

Resolves #484.