Added extend_with_ip to extend message