Hotfix of Connections - now work properly with Packages. Tiny refactorings.