Added further customization of parsing data