Improve unite setting