Added Resource Provider and Locator