Bundle refactoring and cleanup, implemented new combo handler API