1) Checking for png_top - good catch, will fix.
2) I am on the side of differentiating png_uuid from the other two since the other two have a common storage method.