Added type definitions for  and .