Update for new datasystem compatibility
update datasystem compatibility