switch XML bundler to use model architecture