Separated server and client data ingestion
Changed arguments to list action