Add support for multi-package running