Added BundleId to Template