Changes to support file redistribution