Added server/client validations