Added some good support for unite