Added ServiceNameValidator, commented out untested input-filters