Updated bundle to work with Core refactoring