Update to support multiple system version

CurrentOSVersion become a string table