Added factory and service