Updated API to adhere to standards