Fix unified api