Feature #1664: Refactor individual resources graphs