Started adding mechanisms to API for loading data