Update to latest bundle standards