[FEATURE] Got a solution for persistence