Update skeleton queries with connection boilerplate