Improved Service Factory