Added more callbacks for SP