Added ResourceProviderFactory