Add entity type.
Use name-based attribute handling.
Keep track of entity in attributes for equality purposes.