Changes to datamodel to allow multiscript specification