Lots of updates for Unity Integration