Integrating prepare tools right to CLI