Added include_email and include_address parameter support