Added some missing things