[ADD] more type data included