improved datarepository