Moved all internal access to the internal `Api` class using a new static getter.
May need to be tweaked