Variables now back in <entity>.  Incorporated URIorUUID generator.