improved classes