Change archiveBlock to return Option Block and remove weird map