Add connector Id 0 handling by default