Improved data parsing and closure to the term