Updated MSI and Basepath

More to do