Updated core classes