WIP forgot to set infrastructure and type