Now using resource types