Updating API to be more conventional