Changes to support various extra functionality in the bathe plugin and runner