updated namespace, altered service provider