Add state management of DataContent