Improve unite settings