Feature/bundle conf