Fixes to batch controller to include other attributes