Changed value transmission to Map to allow future extensions