Added type definitions