Changed parser back to BufferedReader and handle tokens by spliting
string around ","