Added some types and defines