Comment and refactor persistence layer.
Merge remote-tracking branch 'origin/feature/actions' into feature/actions