Added improvement concerning provider callback