Adds display property.
Adds type property.
Merge branch 'new_feature'