New data model
Fixed scripts for new data model