Refactor CLI
Delegation lifetime configurable