Added flyweight/proxy patterns