This is a follow-up issue to #76. - [ ] Update mappings to make use of the new type that we **did not have** before - [ ] Remove deprecated types (2.0.0)