Service Layer, updated namespaces