Add support for Sub Entities