Updated server side validation