Basic CLI, redefined token file format