Core class updates.