add connector and conn_entry_point and do some modifications