Updated resource types