[FEATURE] Follow-Up: Prepare generic persistence for overlay handling