Adds a few type definitions 24% speedup