Update format for InterceptionData and DetentionLocation