Updated Flyweight