Added factories and services (all needs fixes)