Update of data manager and some API's,