Make connection optional and backwards compatible.