Add support for connectors with sampled data

Not ready for committing, just looking for feedback