New fields added to service mapping