Extracted batch/local/dot to classes