Add basic communication infrastructure