Added more checks, created some own sniffers