Added loading of data point factories