Fixed Service Factory according to namespaces