Resolve #11 - Flyweight