Adding to factories and adding Singleton class