- Convert to use the GetEntity API