Batch APIs, packaging mostly working