Moved to haystack 2.0