Feature/singleton