Added callback checks