Several changes required for connection binding