Add server side validation