Added some missing stuff