Updated datastore and definition file management