Added base clases for creating service-locators