Adding batch updater and relevant classes