Update CipherUtil and related part