[bugfix] Do not expose raw type in API