[CLI] Gustaf: added cli for mate support