Added service factory