support new jenerator
apply new usage of jenerator
Merge branch 'feature/new-jenerator' into develop