Support for latest unite