Added string not empty validation