Added support for CALL_VALIDATION