Added loading of APIs