Added client and server validation