Some more modifications for the API