Added distributive infrastructure
Fixed distributive infrastructure