Update System Information contribution to 2.4