Better feed type sniffing