StaticValidator improvements