Added callback validator #18