Use collection & take out setting of jurisdiction

Small refactor for #125