Simplify distribution building