Added more types and doc for 1.17