Switching static:: to self::