Added server side validation