The Entity has been replaced. Not sure about doing sub-entities.