Handle case where entity contains another entity