Added interactive mode to reduce CLI use leaks