Some service factory changes