Finalize refactoring the Data component