Added flyweight