Create the proper types for everything ignored in PR #156
Create the proper types for everything ignored in PR #156