Updated core files. Structure set.