Enhance hand class logic