Feature/recipient types and client