Some improvements
Supplementary extensions now on win lib