Revert "add new types"

This reverts commit 5aff8a42fde7d420e67210b99eb77f2e163be370.
Revert "Revert "add new types""

This reverts commit 9519d83be96de732041b59e1c40e87c4fd2b2246.