Changed containers to Singleton decorator.