Replace strings
Clean code
Add haystack connections settings