Adding additional validate handlers