:lipstick: Modify data manager