Added stringOnly and singleFile options