Adding new APIs, tests