Add type field to denote charm v. bundle output