Upgrade to Haystack 2.0.0

Fix #111