ROBE-252 Singleton -> Factory