Added some API functionality