Moved conts into cli params