Update for Super/Sub Entity support

Signed-off-by: Darren Ehlers <me@darrenehlers.com>