Added support to type definition