Added factory and services