Added more typedefs