update for BAD type support