Updating deployment to new datastore structure - should work from scratch now