Add some more connections between all this workaround