Extracted connection from builders to base builder. Package refactorization