Post/persistence - Code Improvements