Updated batch functions