Changes for distributed platform