Added some types and a fuction.