Added callback validation