Removed special case class just for this service and replaced with EmailDescription to be consistent with production service. Part of #69