Added code to parse strings