Added some additional API support