Updated API functions to match what people need