Service factory added