Updated connections and collections registration
More fixes, getting close