Reworked design of API accessing class