Master late static binding

Use late static binding via static::