Fixed generic version of BuildDataAccessModel