Use clue/connection-manager-extra