Added server-side validations