added raw connection support