Added API calls to CLI tool