Added more connection stuff