Slight refactoring of the lifecycle of data