applied various output datastore support