updated with new DataSpaces/DIMES APIs