Added metadata, handling zero connections