Added empty string validation