Added additional resource types