Add more callbacks for debugging