Decoupled symbols from actual graphical primitives , added support for matching/replacing
arbitrary symbols