Adding cli capabilities