Updates to Data project, improved scope handling (I hope).