Class support improvement.