Using a bundle instead of the combo handler