Add client and server validation