Changed map to provide model and type information.