Performed some refactoring in the Data subproject