Firmed-up architecture; migrated to SHA1