Type check added for clients