Ed support changes. Moved Subject to Batch instead of Level