Enhanced mostly_static
Enhanced mostly_static