Added service name to email body
Added TODO