Updated core changes to include structure.