Added type-kit