More UserStore implementation and connection management