Also updated cli with cleaner result object