Add remainder of API