Change concrete strategies to singletons