Move to custom CLI