CLC-4410 Make batch more generic; implement get and update; test thoroughly