Updated bundle structure and configuration