additionalFields in full message argument: move condidtion into existing if-else block; change message directly