Enhanced resource related policy objects to contain resource_id