add clientId to props