Refactor the Data component