Adds more sophisticated parsing samples.