Moved services and params into bundle config