Added more to fuzzer