[REFAC] CLI and Framework