Added Library and Type_Number