Feature fix

ServiceLocatorStrategy added