Update for Distribution build