Class improvements