Feature/bundle update