(PUP-1486) Make the resources type more generic