Master late static binding

Use late static binding via static::

Allows better extend-ability.