Added some missing functions