Issue #1 - Adding parent entity support