GH #315 - More resource types.