Updated core structure