Switch to useing bundle config