Add fully functional cli support