Improved Unite's performance