Added some API modifications