Add client validation and case insensetive