Updates after TFS integration