Use a factory to instantiate new services

Change-Id: Ib003e1199d951075ca5a055118782fa062fb9015