CPP UPGRADE: NO MORE ResourceItem