GenericResourceApiProvider fixes part 6