Updated loader to work with current data model