Add validation to Client attributes
Add terms of service