[#73271162] some refactoring for demo