Added Connect support