Add haystack support