improve hscript data model