Changing the type of ClientId to long