More refactory on Distribute methods