Updates
Add abstract class with service locator