Added initial string parse