Updated map to contain complete InvType object