Further implementation of Complex and Entity types with properties.