Implemented server side validation