Improving bundle configuration, refs #31