Added correct provider/service factory registration