Backport v3.0 customer class