Reverted DataSpace strings mistakenly merged