Updated to use bundle sets