Enabled batch support