Changging function names to be inline with the API