removed hardcoding for connection support