Post/persistence - Code Improvement