Updated for lastest bundle changes