Updates for Haystack 2.0