Added more type info