Change clientId from int to Long