Improve Sub-entity support