Adding more validation of client input