Added a handle validator