Added cli and api