Updated core layout