Changed storage to singleton and removed context.