Add Entity, Collection, and Dynamic types

Add nesting in entities.