Updated with new system
Added cv related commands