Moved connection to main package