Updated distribution tools