Improve bundle configuration