Updated type definitions