Improved unity support.