Further additions to the API