Updates to most core classes