Make the provider work properly with the correct instance methods