working on populate subentities and some other components