Improve Unity support