We can change to None only when gkhachik merges his base cli code to disregard None parameters