Refactor persistables