Issue #6. Add extra info for client.