Handle class improvements