Some refactor for easing geppetto call