Issue #4 and Issue #8: Update persistence behavior and adapt system alarm logic accordingly