Added type info type in definition. Removed unused library.