Update restore process, refactor
Update restore process, refactor

srcclr/security-headers,fs/security-headers,fs/security-headers,srcclr/security-headers,srcclr/security-headers,fs/security-headers,srcclr/security-headers,fs/security-headers